inspector: fix compilation with broadway
authorChristian Hergert <chergert@redhat.com>
Thu, 17 Jun 2021 18:40:10 +0000 (11:40 -0700)
committerChristian Hergert <chergert@redhat.com>
Thu, 17 Jun 2021 18:54:00 +0000 (11:54 -0700)
gdk/broadway/gdkbroadwaydisplay.h
gdk/broadway/gdkdisplay-broadway.c
gtk/inspector/visual.c

index 79e78c9a62d03b76b0441b65d0ee3afe9d3a7ff0..767b8b8a9d5f2f95ca49a3b8733b0eb5dfa1bd21 100644 (file)
@@ -48,6 +48,8 @@ void                    gdk_broadway_display_show_keyboard       (GdkBroadwayDis
 GDK_AVAILABLE_IN_ALL
 void                    gdk_broadway_display_hide_keyboard       (GdkBroadwayDisplay *display);
 
+GDK_AVAILABLE_IN_4_4
+int                     gdk_broadway_display_get_surface_scale   (GdkDisplay *display);
 GDK_AVAILABLE_IN_4_4
 void                    gdk_broadway_display_set_surface_scale   (GdkDisplay *display,
                                                                   int         scale);
index 29f2256323d3b935f6022acd6f0a834bc6e61008..a8ebb1dc88a4f196ac5d9209d15bf6cfebce3a46 100644 (file)
@@ -361,6 +361,29 @@ gdk_broadway_display_set_surface_scale (GdkDisplay *display,
   gdk_monitor_set_scale_factor (self->monitor, scale);
 }
 
+/**
+ * gdk_broadway_display_get_surface_scale:
+ * @display: (type GdkBroadwayDisplay): the display
+ *
+ * Gets the surface scale that was previously set by the client or
+ * gdk_broadway_display_set_surface_scale().
+ *
+ * Returns: the scale for surfaces
+ *
+ * Since: 4.4
+ */
+int
+gdk_broadway_display_get_surface_scale (GdkDisplay *display)
+{
+  GdkBroadwayDisplay *self;
+
+  g_return_val_if_fail (GDK_IS_BROADWAY_DISPLAY (display), 1);
+
+  self = GDK_BROADWAY_DISPLAY (display);
+
+  return self->scale_factor;
+}
+
 static GListModel *
 gdk_broadway_display_get_monitors (GdkDisplay *display)
 {
index a328b81c6d55a8bf1d0056c61b30c142cf2b66f4..04351bafc94a3931569d3b3d041a8ef9fca99e01 100644 (file)
@@ -835,9 +835,9 @@ init_scale (GtkInspectorVisual *vis)
 #if defined (GDK_WINDOWING_BROADWAY)
   if (GDK_IS_BROADWAY_DISPLAY (vis->display))
     {
-      double scale;
+      int scale;
 
-      scale = gdk_monitor_get_scale_factor (gdk_x11_display_get_primary_monitor (vis->display));
+      scale = gdk_broadway_display_get_surface_scale (vis->display);
       gtk_adjustment_set_value (vis->scale_adjustment, scale);
       g_signal_connect (vis->scale_adjustment, "value-changed",
                         G_CALLBACK (scale_changed), vis);